Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: bump Go to v1.20 (backport #2409) #2499

Merged
merged 3 commits into from
May 18, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 17, 2023

This is an automatic backport of pull request #2409 done by Mergify.
Cherry-pick of cb523c0 has failed:

On branch mergify/bp/release/v10.0.x/pr-2409
Your branch is up to date with 'origin/release/v10.0.x'.

You are currently cherry-picking commit cb523c0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/release-sims.yml
	modified:   .github/workflows/release.yml
	modified:   .golangci.yml
	modified:   .goreleaser.yml
	modified:   CHANGELOG.md
	modified:   Dockerfile
	modified:   Makefile
	modified:   contrib/Dockerfile.test
	modified:   docs/getting-started/installation.md
	modified:   docs/hub-tutorials/join-testnet.md
	modified:   e2e.Dockerfile
	modified:   go.mod
	modified:   tests/e2e/e2e_globalfee_proposal_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/lint.yml
	both modified:   .github/workflows/sim-label.yml
	both modified:   .github/workflows/sims.yml
	both modified:   .github/workflows/test.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* bump Go to 1.19

* Bump Go to 1.20

* update docs

* Update docs/getting-started/installation.md

Co-authored-by: lg <[email protected]>

* bump golangci in gh workflow

* set actions/checkout version back to v3.5.2

* change go-version from 1.20 to 1.20.x in actions/setup-go

* nit in gh workflow

* first attempt to use two diff go version in gh workflows

* 2nd attempt

* update changelog

* set user in e2e.Dockerfile

* Run E2E docker containers using nonroot

* update revive linter rules

* revert changes in e2e.Dockerfile

* attempt to fix gh workflow and sonarcloud error

---------

Co-authored-by: lg <[email protected]>
(cherry picked from commit cb523c0)

# Conflicts:
#	.github/workflows/lint.yml
#	.github/workflows/sim-label.yml
#	.github/workflows/sims.yml
#	.github/workflows/test.yml
@@ -117,21 +122,31 @@ jobs:
- uses: actions/[email protected]
with:
fetch-depth: 0
<<<<<<< HEAD
- uses: actions/setup-go@v3
with:
go-version: 1.18
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

- uses: technote-space/[email protected]
with:
PATTERNS: |
**/**.go
go.mod
go.sum
- uses: actions/setup-go@v4
with:
go-version: 1.18
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

@shaspitz shaspitz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've fixed conflicts, LGTM. There are a couple spots that 1.18 are still used but I've kept things consistent with #2409

Copy link
Contributor

@jtremback jtremback left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@shaspitz shaspitz merged commit bffbc2c into release/v10.0.x May 18, 2023
@shaspitz shaspitz deleted the mergify/bp/release/v10.0.x/pr-2409 branch May 18, 2023 00:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants